g_return_if_fail() on icon_name != NULL so we get a warning instead of a

2009-01-22  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): g_return_if_fail()
	on icon_name != NULL so we get a warning instead of a crash here.

svn path=/trunk/; revision=22174

diff --git a/ChangeLog b/ChangeLog
index f52f96e6af7c7fcd9daaa0950091331efff091c6..73bb966ba0a3eeaa027807e863b449992600b35c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-22  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): g_return_if_fail()
+       on icon_name != NULL so we get a warning instead of a crash here.
+
 2009-01-21  Matthias Clasen <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 5fc1b3b20bf341e72ae38da789c43c5363c1337e..6df05ef80ee7b3d4dccb40f2e8003e4b793776be 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1571,7 +1571,8 @@ gtk_icon_theme_has_icon (GtkIconTheme *icon_theme,
   GList *l;
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
-  
+  g_return_val_if_fail (icon_name != NULL, FALSE);
+
   priv = icon_theme->priv;
   
   ensure_valid_themes (icon_theme);